Merge remote branch 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Tue, 6 Apr 2010 22:15:43 +0000 (00:15 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 6 Apr 2010 22:15:43 +0000 (00:15 +0200)
commit6f159bdebe29119a40e10bfbab786df03e11d459
treeaa5126264367b98d68adfbd0394423317db9da71
parent019b90fa7f0a4b5f4edb58a39a19d412d3aa7ef6
parent0599bc30f6eb8f90b22bdb133d620a75405c3534
Merge remote branch 'origin/upstream-cvs' into upstream